From e3fa5592beb89f35d7b0078bf5593dc844897dfc Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Sun, 5 Oct 2014 12:27:55 +0200 Subject: [PATCH] Adwaita: fix last vertically linked focused entry --- gtk/resources/theme/Adwaita/_common.scss | 2 +- gtk/resources/theme/Adwaita/gtk-contained-dark.css | 6 +++--- gtk/resources/theme/Adwaita/gtk-contained.css | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 5d75d3c70b..4a2e4a91be 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -384,7 +384,7 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers box-shadow: entry_focus_glow($selected_bg_color), 0 -1px 0 0 entry_focus_border($selected_bg_color), _widget_edge(); - @extend %linked_vertical; + @extend %linked_vertical:last-child; } &:insensitive { @include entry(insensitive); diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 0a4d77f1e5..73d4279b0c 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -1186,20 +1186,20 @@ GtkCalendar.header .inline-toolbar GtkToolButton:backdrop:only-child > .button.t border-radius: 3px; border-style: solid; } -.linked.vertical .entry, .linked.vertical .entry:focus, .linked.vertical .entry:insensitive, .linked.vertical .entry:insensitive:backdrop, .linked.vertical .entry:backdrop, .linked.vertical .entry:last-child:focus, .linked.vertical .button, .linked.vertical .button:hover, .linked.vertical .button:active, .linked.vertical .button:checked, .linked.vertical .button:backdrop, .linked.vertical > GtkComboBoxText > .button, +.linked.vertical .entry, .linked.vertical .entry:focus, .linked.vertical .entry:insensitive, .linked.vertical .entry:insensitive:backdrop, .linked.vertical .entry:backdrop, .linked.vertical .button, .linked.vertical .button:hover, .linked.vertical .button:active, .linked.vertical .button:checked, .linked.vertical .button:backdrop, .linked.vertical > GtkComboBoxText > .button, .linked.vertical > GtkComboBox > .button { border-left-style: solid; border-top-style: none; border-radius: 0; } -.linked.vertical .entry:first-child, .linked.vertical .entry:first-child:last-child:focus, .linked.vertical .button:first-child, .linked.vertical > GtkComboBoxText:first-child > .button, +.linked.vertical .entry:first-child, .linked.vertical .button:first-child, .linked.vertical > GtkComboBoxText:first-child > .button, .linked.vertical > GtkComboBox:first-child > .button { border-style: solid; border-radius: 3px 3px 0 0; } .linked.vertical .entry:last-child, .linked.vertical .button:last-child, .linked.vertical > GtkComboBoxText:last-child > .button, .linked.vertical > GtkComboBox:last-child > .button { border-radius: 0 0 3px 3px; } -.linked.vertical .entry:only-child, .linked.vertical .entry:only-child:last-child:focus, .linked.vertical .button:only-child, .linked.vertical > GtkComboBoxText:only-child > .button, +.linked.vertical .entry:only-child, .linked.vertical .button:only-child, .linked.vertical > GtkComboBoxText:only-child > .button, .linked.vertical > GtkComboBox:only-child > .button { border-radius: 3px; border-style: solid; } diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index e565a21bb3..e1b706cbe1 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -1178,20 +1178,20 @@ GtkCalendar.header .inline-toolbar GtkToolButton:backdrop:only-child > .button.t border-radius: 3px; border-style: solid; } -.linked.vertical .entry, .linked.vertical .entry:focus, .linked.vertical .entry:insensitive, .linked.vertical .entry:insensitive:backdrop, .linked.vertical .entry:backdrop, .linked.vertical .entry:last-child:focus, .linked.vertical .button, .linked.vertical .button:hover, .linked.vertical .button:active, .linked.vertical .button:checked, .linked.vertical .button:backdrop, .linked.vertical > GtkComboBoxText > .button, +.linked.vertical .entry, .linked.vertical .entry:focus, .linked.vertical .entry:insensitive, .linked.vertical .entry:insensitive:backdrop, .linked.vertical .entry:backdrop, .linked.vertical .button, .linked.vertical .button:hover, .linked.vertical .button:active, .linked.vertical .button:checked, .linked.vertical .button:backdrop, .linked.vertical > GtkComboBoxText > .button, .linked.vertical > GtkComboBox > .button { border-left-style: solid; border-top-style: none; border-radius: 0; } -.linked.vertical .entry:first-child, .linked.vertical .entry:first-child:last-child:focus, .linked.vertical .button:first-child, .linked.vertical > GtkComboBoxText:first-child > .button, +.linked.vertical .entry:first-child, .linked.vertical .button:first-child, .linked.vertical > GtkComboBoxText:first-child > .button, .linked.vertical > GtkComboBox:first-child > .button { border-style: solid; border-radius: 3px 3px 0 0; } .linked.vertical .entry:last-child, .linked.vertical .button:last-child, .linked.vertical > GtkComboBoxText:last-child > .button, .linked.vertical > GtkComboBox:last-child > .button { border-radius: 0 0 3px 3px; } -.linked.vertical .entry:only-child, .linked.vertical .entry:only-child:last-child:focus, .linked.vertical .button:only-child, .linked.vertical > GtkComboBoxText:only-child > .button, +.linked.vertical .entry:only-child, .linked.vertical .button:only-child, .linked.vertical > GtkComboBoxText:only-child > .button, .linked.vertical > GtkComboBox:only-child > .button { border-radius: 3px; border-style: solid; } -- 2.30.2